Revert "lib: Fix building against old glib versions"

This reverts commit f1d9196076d4aea1f64e0d2cbd17bfa2891b8c4c.

Since libglnx.h does not get installed, it can't be included in
ostree-autocleanups.h, which is included by ostree.h.

Closes: #1615
Approved by: jlebon

diff --git a/src/libostree/ostree-autocleanups.h b/src/libostree/ostree-autocleanups.h
index ae67872100dcc6188321b75abf8e9f58e39f9c10..9a54aee76640598f4cdd2e77a90744f065852536 100644 (file)
--- a/src/libostree/ostree-autocleanups.h
+++ b/src/libostree/ostree-autocleanups.h
@@ -24,7 +24,6 @@
 #pragma once
 
 #include <ostree.h>
-#include <libglnx.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/libostree/ostree-ref.c b/src/libostree/ostree-ref.c
index 34d6724028041e3cf89f04de22262e7a80af2641..35fd5821f5791c0dfb9efc4f9e2e144b92e2f2c5 100644 (file)
--- a/src/libostree/ostree-ref.c
+++ b/src/libostree/ostree-ref.c
@@ -27,6 +27,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-core.h"

diff --git a/src/libostree/ostree-repo-finder-config.c b/src/libostree/ostree-repo-finder-config.c
index 8e617afcaade83f505ee513aa3f89bfdf391f6e7..4366d72a75c64671f5323893f5d1d153716526b3 100644 (file)
--- a/src/libostree/ostree-repo-finder-config.c
+++ b/src/libostree/ostree-repo-finder-config.c
@@ -28,6 +28,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-remote-private.h"

diff --git a/src/libostree/ostree-repo-finder-mount.c b/src/libostree/ostree-repo-finder-mount.c
index 864510e54c6500090a0239cd7cac6ffc4256b633..c259f3e6b20a756dabff722378636e54b2fd8dd5 100644 (file)
--- a/src/libostree/ostree-repo-finder-mount.c
+++ b/src/libostree/ostree-repo-finder-mount.c
@@ -28,6 +28,7 @@
 #include <gio/gunixmounts.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 #include <stdlib.h>
 
 #include "ostree-autocleanups.h"

diff --git a/src/libostree/ostree-repo-finder-override.c b/src/libostree/ostree-repo-finder-override.c
index 6917dbe0480e6c35c7330ef2eadc02506b3e9e0e..3219954642e7a2d389066ab835a2b2853d8617ae 100644 (file)
--- a/src/libostree/ostree-repo-finder-override.c
+++ b/src/libostree/ostree-repo-finder-override.c
@@ -28,6 +28,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-remote-private.h"

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 52784b4c11d8da52bcced2ef40825c09f89f652e..f3da1cae5111940daf210776c863ead5812fa2db 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -28,6 +28,7 @@
 #include <gio/gunixinputstream.h>
 #include <gio/gunixoutputstream.h>
 #include <gio/gfiledescriptorbased.h>
+#include "libglnx.h"
 #include "otutil.h"
 #include <glnx-console.h>
 

diff --git a/tests/test-repo-finder-mount.c b/tests/test-repo-finder-mount.c
index 948a3245155f04f70f202e580cd4029d39908691..55eb47fb25861556f4c95efefc4406f4e8638092 100644 (file)
--- a/tests/test-repo-finder-mount.c
+++ b/tests/test-repo-finder-mount.c
@@ -27,6 +27,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 #include <locale.h>
 
 #include "libostreetest.h"